Bring all main changes into develop by TheWitness · Pull Request #77 · Cacti/plugin_servcheck

TheWitness · 2026-02-14T16:42:38Z

No description provided.

Currently translated at 83.0% (279 of 336 strings) Translation: Cacti/servcheck Translate-URL: http://translate.cacti.net/projects/cacti/servcheck/ru/

* QA: Unable to save the poller for a service check * Add mqtt test (#23) * add mqtt test * formatting * update * add DOH * update * changes requested * develop to main + small changes --------- Co-authored-by: TheWitness <thewitness@cacti.net>

…formed and some don't #27 (#28) * Update CHANGELOG.md * poller_servcheck.php * servcheck_test.php * arrays.php

* Add mqtt test (#23) * add mqtt test * formatting * update * add DOH * update * changes requested * fix plaintext DNS (incorrect variable) * fix plaintext dns - remove cert settings * fix DNS test when incorrect dns server is configured * update

…ally from cacti poller (Issue #31) (#32) * Update CHANGELOG.md * poller_servcheck.php * servcheck_test.php * arrays.php * issue #31 fix poller_servcheck.php does not run any test when it runs automatically from cacti poller * issue #31 fix poller_servcheck.php does not run any test when it runs automatically from cacti poller * typo line 326 arrays.php * Update servcheck_test.php order by the statistics * Update CHANGELOG.md

* Fix graph is not displayed correctly issue#2 Fix graph is not displayed correctly issue#2 * Update CHANGELOG.md

* Update poller_servcheck.php /* let PHP run just as long as it has to */ // modified by MSS on 2025-03-08 //ini_set('max_execution_time', '120'); * Update servcheck_process.php Fix a bug in the certificate check * Update servcheck_test.php Enhancement on the graph page * Update setup.php Add 30 days to check the certificate validity * Update functions.php Finetune the graph display. * Update tests.php Fix bugs related to CA certificate Fix typos * Update CHANGELOG.md Fix certificate check does not function as expected #35 * Update servcheck_process.php Revise the date format. * Update servcheck_process.php Finetuning the date format * Update CHANGELOG.md Fix certificate check does not function as expected #36 * Update CHANGELOG.md * issue#36: Fix certificate check does not function as expected * Update functions.php * issue#36: Fix certificate check does not function as expected * Update tests.php * issue#36: Fix certificate check does not function as expected * Update servcheck_process.php removing undesired commented lines. * Update poller_servcheck.php /* let PHP run just as long as it has to */ ini_set('max_execution_time', '270'); and removing sleep(2) after exec background * Update CHANGELOG.md issue#35: Fix certificate check does not function as expected * Update servcheck_process.php (isset($test['expiry_date']) ? $test['expiry_date'] : 'Invalid Expiry Date')

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: http://translate.cacti.net/projects/cacti/servcheck/sv/

* Date format update from from 'd-b-Y h:i:s p' to 'd-M-Y h:i:s A' Date format update from from 'd-b-Y h:i:s p' to 'd-M-Y h:i:s A' * apply the date format as per Cacti using date_time_format() apply the date format as per Cacti using date_time_format()

…['expiry_date'] (#38) apply the date format as per Cacti using date_time_format() for $test['expiry_date']

… certificate. (#39) * Create /cert/ca-bundle.crt create /cert folder and move ca-bundle.crt to it. * Delete ca-bundle.crt as it is moved to /servcheck/cert folder Delete ca-bundle.crt as it is moved to /servcheck/cert folder * Update tests.php enhance own certificate usage Update tests.php enhance own certificate usage * add dedicated folder for certificates and enhance the usage of custom certificate. add dedicated folder for certificates and enhance the usage of custom certificate.

* Add mqtt test (#23) * add mqtt test * formatting * update * add DOH * update * changes requested * beginning * beginning2 * change creating sql tables * add new restapi * finishing rest api form * add missing column * clean validation, restapi test remains * add missing authid_name save * first test * basic auth works * preparing oauth2 * apikey working * working cookie * all is broken * done * add old code * update

* better validation (remove old webseer code) * update

When first running a test, it has no last results. ERROR PHP WARNING in Plugin 'servcheck': Undefined array key "result_search" in file: plugins/servcheck/poller_servcheck.php on line: 191 ERROR PHP WARNING in Plugin 'servcheck': Undefined array key "result" in file: plugins/servcheck/poller_servcheck.php on line: 185

strpo === 0 means it would only run if the : was at the beginning of the line. Should use !== FALSE or the new str_contains function. $service_types_ports wasn't set as a global, so it was empty inside the function (noticed after fixing above).

Webseer used to have this back in the day, super handy.

* fix #42 - duplicate tests * update

Currently translated at 21.1% (71 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Currently translated at 30.0% (101 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Currently translated at 35.1% (118 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Currently translated at 35.7% (120 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Currently translated at 43.1% (145 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Currently translated at 46.1% (155 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Currently translated at 54.4% (183 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/sv/

* fix incorrect parameter count, rename functions * fix issue if from_email is not set * include vs require

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/sv/

…hange (#60)

Added checks for the existence of the 'plugin_servcheck_restapi_method' table before creating backups and processing records. Refactored credential handling for different types and ensured proper encryption and database updates.

* Change duration color code in arrays.php * Update certificate expiry notification settings --------- Co-authored-by: TheWitness <thewitness@cacti.net>

* Refactor certificate expiry handling and notifications Updated certificate expiry date handling and notification logic. The previous certificate expiry date logic retrieves the expiry date as UTC not local. Enhanced the code so that to eliminate unnecessary overwhelming email notifications, for every change in the certificate. It is recommended to be disabled so that to focust on the expiring and expired certificates. Enhanced the code so that to eliminate unnecessary overwhelming email notifications, for every change search string. It is recommended to be disabled so that to focus on the notifications that require action. * Add styles for selected table rows in servcheck_test Added styles for selected table rows to change background and font color. // When a row is selected, set the backgound-color as black and font color as white print "<style> tr.tableRow.selectable.selected, tr.tableRow.selectable.selected td { background-color: #000 !important; color: #fff !important; } </style>"; * Change 'ok' color code in arrays.php * Enhance row selection and hover styles in servcheck_test * Fix typo in comment for row styling * Refactor email sending logic in servcheck_process.php * Update servcheck_test.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update servcheck_process.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update servcheck_test.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Refactor CSS for selectable rows to use function Replaced inline CSS for selectable rows with a function call. * Fix typo in comment for email notifications * Update servcheck_process.php * Update servcheck_process.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Include local timezone in certificate expiration messages Added local timezone information to certificate expiration notifications. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Add agents and Pipelines Add missing .github folder

Currently translated at 58.8% (197 of 335 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/zh_Hant/

* Add Signal Handling, Cacti process registration, and php-cs-fixer * Make sure the record is removed * Fixing some warnings * Remove table from replication as it's been removed * Changes per Copilot review * More Copilot recommendations

* Small issue with no tests * Syntax error in SQL * Update poller_servcheck.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update workflow * Update workflow * Updating workflows * Add the development component * Script Permissions * Script Permissions * Fix php-cs-fixer issues

* new stats, log retention, cpu/mem stats * remove old code * csfixer --------- Co-authored-by: TheWitness <thewitness@cacti.net>

* Add Agents/Pipeline Add agents and Pipelines Add missing .github folder * Create copilot-instructions.md * Update plugin-ci-workflow.yml * Update .github/copilot-instructions.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update copilot-instructions.md * Remove duplicate agent files * Initial plan * Rename triage_agent.md.agent.md to triage_agent.agent.md Co-authored-by: bmfmancini <13388748+bmfmancini@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: bmfmancini <13388748+bmfmancini@users.noreply.github.com>

Copilot

Pull request overview

This pull request merges changes from the main branch into develop, representing a significant version update from 0.2 to 0.4 for the Cacti servcheck plugin. The PR includes copyright year updates (2024→2025), architectural refactoring with new test implementation modules, credential encryption enhancements, and process management improvements.

Changes:

Version bump from 0.2 to 0.4 with extensive feature additions per CHANGELOG
Refactored test implementations into modular files (test_*.php)
Added new credential encryption system using AES-256-CBC
Renamed/consolidated proxy management (servcheck_proxies.php → servcheck_proxy.php)
Added GitHub workflow for CI/CD and agent configuration files
Updated copyright years across all files to 2025

Reviewed changes

Copilot reviewed 43 out of 44 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
INFO	Version updated from 0.2 to 0.4
CHANGELOG.md	Documents new features in 0.3 and 0.4 releases
servcheck_restapi.php	New REST API management page (marked as read-only, deprecated for v0.5)
servcheck_proxy.php	Replaces servcheck_proxies.php with updated structure
servcheck_proxies.php	Deleted (replaced by servcheck_proxy.php)
servcheck_ca.php	Major refactoring with consistent patterns
poller_servcheck.php	Enhanced process control and signal handling
includes/test_*.php	New modular test implementations (SSH, SNMP, REST API, MQTT, Mail, FTP, DNS, cURL)
includes/tests.php	Deleted (replaced by modular test files)
includes/functions.php	Added encryption/decryption functions, renamed plugin_servcheck_* to servcheck_*
includes/mxlookup.php	Code formatting improvements
tmp_data/index.php	New security redirect file
locales/po/*.po	Translation updates
README.md	Updated documentation with new features
.github/	Added CI/CD workflow and agent configurations

Copilot · 2026-02-14T16:47:36Z

servcheck_restapi.php

+
+	html_end_box();
+
+	print '<b><font color="red">Rest API was moved to tests. Authhorization data was moved to Credential tab. This is read-only and will be removed in version 0.5</font></b>';


Typo in the warning message: "Authhorization" should be "Authorization".

Copilot · 2026-02-14T16:47:37Z

servcheck_restapi.php

+
+	$columns = cacti_sizeof($display_text);
+
+	print '<b><font color="red">Rest API was moved to tests. Authhorization data was moved to Credential tab. This is read-only and will be removed in version 0.5</font></b>';


Typo in the warning message: "Authhorization" should be "Authorization".

Copilot · 2026-02-14T16:47:37Z

servcheck_restapi.php

+
+	form_end();
+
+	print '<b><font color="red">Rest API was moved to tests. Authhorization data was moved to Credential tab. This is read-only and will be removed in version 0.5</font></b>';


Typo in the warning message: "Authhorization" should be "Authorization" (same spelling error appears three times in this file).

Copilot · 2026-02-14T16:47:37Z

includes/test_mqtt.php

+		// curl needs username with %40 instead of @
+		$cred = str_replace('@', '%40', $credential['username']);
+		$cred .= ':';
+		$cred .= $credial['password'];


Typo in variable name: "$credial" should be "$credential".

Suggested change

$cred .= $credial['password'];

$cred .= $credential['password'];

Copilot · 2026-02-14T16:47:37Z

includes/test_ssh.php

+	if (isset($key_filename)) {
+		unlink($key_filename);


Undefined variable: "$key_filename" is used but only "$keyfilename" is defined. This should be "$keyfilename" to match the variable defined on line 109.

Suggested change

if (isset($key_filename)) {

unlink($key_filename);

if (isset($keyfilename)) {

unlink($keyfilename);

Linegod and others added 30 commits November 17, 2024 13:13

typos

5bb1f44

Translated using Weblate (Russian)

7c64f8e

Currently translated at 83.0% (279 of 336 strings) Translation: Cacti/servcheck Translate-URL: http://translate.cacti.net/projects/cacti/servcheck/ru/

Merging develop to main (#29)

66b06d0

* QA: Unable to save the poller for a service check * Add mqtt test (#23) * add mqtt test * formatting * update * add DOH * update * changes requested * develop to main + small changes --------- Co-authored-by: TheWitness <thewitness@cacti.net>

servcheck plug bug fix - all tests are enabled, however, some get per…

565aeed

…formed and some don't #27 (#28) * Update CHANGELOG.md * poller_servcheck.php * servcheck_test.php * arrays.php

Fix more DNS check bugs (#30)

022b250

* Add mqtt test (#23) * add mqtt test * formatting * update * add DOH * update * changes requested * fix plaintext DNS (incorrect variable) * fix plaintext dns - remove cert settings * fix DNS test when incorrect dns server is configured * update

Fix graph is not displayed correctly issue#2 (#33)

3636f5a

* Fix graph is not displayed correctly issue#2 Fix graph is not displayed correctly issue#2 * Update CHANGELOG.md

typos

746fc1c

Translated using Weblate (Swedish)

48d78cc

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: http://translate.cacti.net/projects/cacti/servcheck/sv/

Translated using Weblate (Swedish)

cb0752f

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: http://translate.cacti.net/projects/cacti/servcheck/sv/

apply the date format as per Cacti using date_time_format() for $test…

cbeba9c

…['expiry_date'] (#38) apply the date format as per Cacti using date_time_format() for $test['expiry_date']

typos

c28014f

better validation (#41)

3aed9ab

* better validation (remove old webseer code) * update

typo

ee0192d

Fix broken port concatination

cbc1682

strpo === 0 means it would only run if the : was at the beginning of the line. Should use !== FALSE or the new str_contains function. $service_types_ports wasn't set as a global, so it was empty inside the function (noticed after fixing above).

Add ability to bypass resolver for web urls

6e7bbd2

Webseer used to have this back in the day, super handy.

fix #42 - duplicate tests (#43)

955d8e9

* fix #42 - duplicate tests * update

Added translation using Weblate (Georgian)

c254ff8

Translated using Weblate (Georgian)

f3f978f

Currently translated at 21.1% (71 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Translated using Weblate (Georgian)

f436671

Currently translated at 30.0% (101 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Translated using Weblate (Georgian)

88a4126

Currently translated at 35.1% (118 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Translated using Weblate (Georgian)

f712c82

Currently translated at 35.7% (120 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Translated using Weblate (Georgian)

ce8fae1

Currently translated at 43.1% (145 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Translated using Weblate (Georgian)

fdbfe84

Currently translated at 46.1% (155 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Translated using Weblate (Georgian)

2e3e366

Currently translated at 54.4% (183 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/ka/

Daniel Nylander and others added 24 commits October 17, 2025 12:18

Translated using Weblate (Swedish)

85b8912

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/sv/

Translated using Weblate (Swedish)

cc30870

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/sv/

Translated using Weblate (Swedish)

26f9c9a

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/sv/

Translated using Weblate (Swedish)

2a67462

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/sv/

fix incorrect parameter count, rename functions (#58)

a216a5e

* fix incorrect parameter count, rename functions * fix issue if from_email is not set * include vs require

update (#59)

1e222bf

Translated using Weblate (Swedish)

a633d60

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/sv/

Translated using Weblate (Swedish)

8767839

Currently translated at 100.0% (336 of 336 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/sv/

fix false certificate expire notification during summer/winter time c…

0401962

…hange (#60)

typos

f54b724

Update CA certificate file naming in test_curl.php (#63)

1b3ad1c

Change duration color code in arrays.php (#65)

9df0fc3

* Change duration color code in arrays.php * Update certificate expiry notification settings --------- Co-authored-by: TheWitness <thewitness@cacti.net>

Mss970 patch 4 (#66)

1c8eff2

* Change duration color code in arrays.php * Update certificate expiry notification settings --------- Co-authored-by: TheWitness <thewitness@cacti.net>

Add Agents/Pipeline (#68)

6e2b46d

Add agents and Pipelines Add missing .github folder

Translated using Weblate (Chinese (Traditional Han script))

03f7811

Currently translated at 58.8% (197 of 335 strings) Translation: Cacti/servcheck Translate-URL: https://translate.cacti.net/projects/cacti/servcheck/zh_Hant/

formatting, fix missing column during the update (#70)

796a983

Update workflow to included PHP8.4 and use MariaDB 10.6 (#73)

a541c74

* Update workflow * Update workflow * Updating workflows * Add the development component * Script Permissions * Script Permissions * Fix php-cs-fixer issues

new stats, log retention, cpu/mem stats (#74)

413ec24

* new stats, log retention, cpu/mem stats * remove old code * csfixer --------- Co-authored-by: TheWitness <thewitness@cacti.net>

Renaming functions due to name space collision (#76)

c35d7ed

TheWitness requested review from browniebraun, Copilot and xmacan February 14, 2026 16:42

Copilot started reviewing on behalf of TheWitness February 14, 2026 16:43 View session

Copilot AI reviewed Feb 14, 2026

View reviewed changes

TheWitness closed this Feb 14, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bring all main changes into develop#77

Bring all main changes into develop#77
TheWitness wants to merge 63 commits intodevelopfrom
main

TheWitness commented Feb 14, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants


		html_end_box();

		print '<b><font color="red">Rest API was moved to tests. Authhorization data was moved to Credential tab. This is read-only and will be removed in version 0.5</font></b>';


		$columns = cacti_sizeof($display_text);

		print '<b><font color="red">Rest API was moved to tests. Authhorization data was moved to Credential tab. This is read-only and will be removed in version 0.5</font></b>';


		form_end();

		print '<b><font color="red">Rest API was moved to tests. Authhorization data was moved to Credential tab. This is read-only and will be removed in version 0.5</font></b>';

	$cred .= $credial['password'];
	$cred .= $credential['password'];

Conversation

TheWitness commented Feb 14, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants